From: Xue Fuqiao <xfq.free@gmail.com>
Date: Wed, 25 Dec 2013 22:27:00 +0000 (+0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~1775^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=77bbf3713d459c45492e6daed68437edcf863a0c;p=emacs.git

Merge from mainline.
---

77bbf3713d459c45492e6daed68437edcf863a0c